projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
72d1ba8
)
deploy: Propertly append multiple kernel arguments with --karg-proc-cmdline
author
Colin Walters
<walters@verbum.org>
Fri, 1 Aug 2014 12:54:17 +0000
(08:54 -0400)
committer
Colin Walters
<walters@verbum.org>
Sun, 3 Aug 2014 18:11:40 +0000
(14:11 -0400)
We want to allow multiply specified arguments, as it's useful for
things like console= and rd.lvm.lv.
See: https://bugzilla.gnome.org/show_bug.cgi?id=721136
Reported-by: Dusty Mabe <dustymabe@gmail.com>
src/ostree/ot-admin-builtin-deploy.c
patch
|
blob
|
history
diff --git
a/src/ostree/ot-admin-builtin-deploy.c
b/src/ostree/ot-admin-builtin-deploy.c
index b99497fe0dbdf1122ea857106d250ea8890db8d9..a99cc89e506e93739aea49f419a8fefa5099eaa9 100644
(file)
--- a/
src/ostree/ot-admin-builtin-deploy.c
+++ b/
src/ostree/ot-admin-builtin-deploy.c
@@
-143,7
+143,7
@@
ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell
g_strchomp (proc_cmdline);
proc_cmdline_args = g_strsplit (proc_cmdline, " ", -1);
- _ostree_kernel_args_
replace
_argv (kargs, proc_cmdline_args);
+ _ostree_kernel_args_
append
_argv (kargs, proc_cmdline_args);
}
else if (merge_deployment)
{